From aeeb4d285458ac6e30c5702953a7d9e98de8ee49 Mon Sep 17 00:00:00 2001
From: "djm@kirby.fc.hp.com" <djm@kirby.fc.hp.com>
Date: Thu, 3 Nov 2005 18:06:15 -0600
Subject: [PATCH] Fix gcc-3.4 compiler errors (submitted by Takebe Akio)

---
 xen/arch/ia64/linux-xen/efi.c       | 3 ++-
 xen/arch/ia64/linux-xen/mm_contig.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/xen/arch/ia64/linux-xen/efi.c b/xen/arch/ia64/linux-xen/efi.c
index c75f0fe728..d42935ddea 100644
--- a/xen/arch/ia64/linux-xen/efi.c
+++ b/xen/arch/ia64/linux-xen/efi.c
@@ -24,7 +24,6 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/time.h>
-#include <linux/efi.h>
 
 #include <asm/io.h>
 #include <asm/kregs.h>
@@ -33,6 +32,8 @@
 #include <asm/processor.h>
 #include <asm/mca.h>
 
+#include <linux/efi.h>
+
 #define EFI_DEBUG	0
 
 extern efi_status_t efi_call_phys (void *, ...);
diff --git a/xen/arch/ia64/linux-xen/mm_contig.c b/xen/arch/ia64/linux-xen/mm_contig.c
index 896a871c3b..ee1d510636 100644
--- a/xen/arch/ia64/linux-xen/mm_contig.c
+++ b/xen/arch/ia64/linux-xen/mm_contig.c
@@ -16,7 +16,6 @@
  */
 #include <linux/config.h>
 #include <linux/bootmem.h>
-#include <linux/efi.h>
 #include <linux/mm.h>
 #include <linux/swap.h>
 
@@ -26,6 +25,7 @@
 #include <asm/sections.h>
 #include <asm/mca.h>
 
+#include <linux/efi.h>
 #ifdef CONFIG_VIRTUAL_MEM_MAP
 static unsigned long num_dma_physpages;
 #endif
-- 
2.30.2